Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 8 Jul 2010 11:50:25 +0000 (11:50 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 8 Jul 2010 11:50:25 +0000 (11:50 +0000)
commitca0223dd3a016132a24021954e2907f4d1c0319d
tree73c434fb60492af3740854d128a2e8d28a30cf2e
parentea314e3a552f4c7ed58cc9b326e70456826d2d27
parent41d81786331d91e4050a9816a754dd057bcf4783
Merge from mainline.